bitkeeper revision 1.1159.1.433 (419be7a0fc5aLvTuXA3x6in1I0qXvg)
authorcl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Thu, 18 Nov 2004 00:06:56 +0000 (00:06 +0000)
committercl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Thu, 18 Nov 2004 00:06:56 +0000 (00:06 +0000)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xen.bk-smp


Trivial merge